(server-visit-files): If `minibuffer-auto-raise' has been set to t, respect it.

diff --git a/lisp/server.el b/lisp/server.el
index ec9746598412d4e6653aba6068e3ec12399e8326..bcb79d6b9acbcb68849d9e68a09e8e903b7c4b59 100644 (file)
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -511,7 +511,8 @@ so don't mark these buffers specially, just visit them normally."
        ;; If there is an existing buffer modified or the file is
        ;; modified, revert it.  If there is an existing buffer with
        ;; deleted file, offer to write it.
-       (let* ((minibuffer-auto-raise server-raise-frame)
+       (let* ((minibuffer-auto-raise (or server-raise-frame
+                                          minibuffer-auto-raise))
               (filen (car file))
               (obuf (get-file-buffer filen)))
          (add-to-history 'file-name-history filen)